Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMPROVE] Rewrite OTR modals #22583

Merged
merged 8 commits into from
Jul 5, 2021
Merged

[IMPROVE] Rewrite OTR modals #22583

merged 8 commits into from
Jul 5, 2021

Conversation

dougfabris
Copy link
Member

@dougfabris dougfabris commented Jul 5, 2021

Proposed changes (including videos or screenshots)

image
image
image

Issue(s)

Steps to test or reproduce

  • Create OTR with another user (both need to be logged in at the same time)
  • New OTR acceptance modal should be displayed
  • Deny OTR
  • On the user's screen that created the OTR, the new "deny" modal should display
  • Request OTR again
  • With one of the users, end OTR
  • New modal for ending OTR should show up in the other user's screen

Further comments

@lgtm-com
Copy link

lgtm-com bot commented Jul 5, 2021

This pull request introduces 1 alert when merging 1b378f5 into 7b1c021 - view on LGTM.com

new alerts:

  • 1 for Unused variable, import, function or class

@gabriellsh gabriellsh changed the title [IMPROVE] OTR modals [IMPROVE] Rewrite OTR modals Jul 5, 2021
@gabriellsh gabriellsh merged commit 0746abe into develop Jul 5, 2021
@gabriellsh gabriellsh deleted the improve/otr-modals branch July 5, 2021 20:35
aditya-mitra added a commit to aditya-mitra/Rocket.Chat that referenced this pull request Jul 16, 2021
The custom message will be the sent for the first incoming in the channels selected by the OutOfOffice User
Added a second model OutOfOfficeRooms to effectively carry out search and send the OutOfOffice message

parent 6ef35ed
author aditya-mitra <ultrapokeinstinct@gmail.com> 1625465055 +0530
committer aditya-mitra <ultrapokeinstinct@gmail.com> 1626418539 +0530

Add Post Message Handler

The custom message will be the sent for the first incoming in the channels selected by the OutOfOffice User
Added a second model OutOfOfficeRooms to effectively carry out search and send the OutOfOffice message

add post message check

[FIX] Omnichannel - Fix issue with modals on room preview mode. (RocketChat#22541)

* Await error on main thread so meteor can handle it

* Fix an issue where clicking esc would trigger a room read on unsubscribed rooms

Co-authored-by: Renato Becker <renato.augusto.becker@gmail.com>

[FIX] Redirect to login after delete own account (RocketChat#22499)

[FIX] UIKit URL prop being ignored for buttons (RocketChat#22579)

Chore: Upgrade NPM dependencies (RocketChat#22562)

Chore: Upgrade Micro Services NPM dependencies (RocketChat#22561)

[FIX] Create Discussion modal - Parent room input not displaying correct room name RocketChat#22580

[IMPROVE] Rewrite OTR modals (RocketChat#22583)

* improve: rewrite accept otr modal

* improve: rewrite otr end modal

* improve: deny otr modal

* fix: lint

Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>

i18n: Language update from LingoHub 🤖 on 2021-07-05Z (RocketChat#22572)

* Language update from LingoHub 🤖

Project Name: Rocket.Chat
Project Link: https://translate.lingohub.com/rocketchat/dashboard/rocket-dot-chat
User: Robot LingoHub

Easy language translations with LingoHub 🚀

* remove translated variables

Co-authored-by: Robot LingoHub <robot@lingohub.com>
Co-authored-by: Diego Sampaio <chinello@gmail.com>

Chore: [Snyk] Security upgrade node-gcm from 0.14.4 to 1.0.0 (RocketChat#22582)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-LODASH-1040724

[FIX] Livechat webhook request without headers (RocketChat#22589)

[IMPROVE] Rewrite Enter Encryption Password Modal (RocketChat#22456)

* improve: rewrite modal

* fix: modal props

* fix: translation key

* fix: review

Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>

[NEW] Convert Team to Channel (RocketChat#22476)

* wip

* Add extra param to listRoomsOfUser to filter rooms user can delete

* update the way permission was being checked

* new: convert team to channel

* fix: lastOwner warning

* fix: review

* improve: convert ChannelDesertationTable to ts

* Remove unused prop

Co-authored-by: Douglas Fabris <deefabris@gmail.com>
Co-authored-by: Kevin Aleman <kevin.aleman@rocket.chat>
Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>

[IMPROVE] Rewrite Save Encryption Password Modal (RocketChat#22447)

* improve: rewrite modal

* fix: translation keys

* fix: review

* fix: lint

Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>

[FIX] Error in permission check for getLivechatDepartmentByNameOrId method in Apps (RocketChat#22545)

[FIX] Checks the list of agents if at least one is online (RocketChat#22584)

Co-authored-by: Diego Sampaio <chinello@gmail.com>

remove sent roomIds

change OutOfOffice to OutOfOfficeUser model

move date validation to update.ts

correction in renaming (should be plural)

add OutOfOfficeRooms model

post message handler added

fix lint errors

[IMPROVE] Sidebar icons margins (RocketChat#22498)

* Change components

* Update fuselage

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>

[FIX] Convert Team to Channel menu order RocketChat#22606

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>

[IMPROVE] Rewrite URL check modal (RocketChat#22540)

* fix modal not being called

* Rewrite url change modal

Co-authored-by: Douglas Fabris <devfabris@gmail.com>

[FIX] Button overlapping modal RocketChat#22605

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>

[FIX] User cannot delete own files in contextualbar RocketChat#22595

Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>

Regression: Client crashing on startup (RocketChat#22610)

[FIX] Confirm owner change process when deleting own account (RocketChat#22609)

* fix: confirm owner change deleting own account

* fix: missing return statement

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>

[FIX] Markdown for UiKit blocks (RocketChat#22619)

Regression: Change the name of called methods in Users model (RocketChat#22620)

[NEW] REST endpoint to remove User from Role (RocketChat#20485)

* [WIP] added test

* [WIP] added api endpoint to remove role from user

* [WIP] added test with Subscription Scope

* Update roles.js

* fix endpoint params

* update tests

* remove .only

Co-authored-by: Lucas Sartor Chauvin <lucassartorchauvin@gmail.com>
Co-authored-by: Leonardo Ostjen Couto <leonardoostjen@gmail.com>

Create README.md (RocketChat#22615)

Add the Out of Office Scheduler

Out of Office will be auto-disabled at the endDate and auto-enabled at the startDate
Internally uses AgendaJS

[FIX] VisitorClientInfo not showing (RocketChat#22593)

* fix visitor info

* fix prettier error

* include host and ip

Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>

Chore: Use projection instead of fields to avoid error log (RocketChat#22629)

fixed - room still listed after delete (RocketChat#22613)

Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>

[FIX] Prune messages from particular user(s) (RocketChat#22506)

[FIX] Livechat apps permission error (RocketChat#22511)

Bump version to 3.16.1

[FIX] Livechat webhook request without headers (RocketChat#22589)

[FIX] Error in permission check for getLivechatDepartmentByNameOrId method in Apps (RocketChat#22545)

[FIX] Checks the list of agents if at least one is online (RocketChat#22584)

Co-authored-by: Diego Sampaio <chinello@gmail.com>

Regression: Change the name of called methods in Users model (RocketChat#22620)

Bump version to 3.16.2

Bump version to 3.16.3

[FIX] Info page - Instances card modal table width RocketChat#22627
@ggazzo ggazzo mentioned this pull request Jul 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants